From 4d81504ff449010daf69d930ebcd2d23b19a1cda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Tue, 10 Nov 2015 12:07:32 +0100 Subject: [PATCH] x86: allow disabling the emulated VGA MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/stdvga.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index 86c94d272a..bd23b52888 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -578,6 +578,9 @@ void stdvga_init(struct domain *d) struct page_info *pg; unsigned int i; + if ( !has_vvga(d) ) + return; + memset(s, 0, sizeof(*s)); spin_lock_init(&s->lock); @@ -615,6 +618,9 @@ void stdvga_deinit(struct domain *d) struct hvm_hw_stdvga *s = &d->arch.hvm_domain.stdvga; int i; + if ( !has_vvga(d) ) + return; + for ( i = 0; i != ARRAY_SIZE(s->vram_page); i++ ) { if ( s->vram_page[i] == NULL ) -- 2.30.2